--- /dev/null
--- /dev/null
++# see git-dpm(1) from git-dpm package
++9912f34116800059da8d5dc65df7b5863ea923bf
++9912f34116800059da8d5dc65df7b5863ea923bf
++2fe1e45581c037e7a4318690565a826355763aed
++2fe1e45581c037e7a4318690565a826355763aed
++emacs23_23.2+1.orig.tar.bz2
++41418b900fc088a5a34d0b493d0d6b731a499f06
++23319578
--- /dev/null
--- /dev/null
++From f432ba1b77d194a9d1170e8e24de983a29c77d33 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:21 -0500
++Subject: debian-site-init-el.diff
++ * Emacs will prefer /usr/share/info/emacs-23 over /usr/share/info.
++ Patch: debian-site-init-el.diff
++
++ The value of Info-default-directory-list has been augmented via
++ site-init.el to include /usr/share/info/emacs-23 before
++ /usr/share/info.
++---
++ lisp/site-init.el | 11 +++++++++++
++ 1 files changed, 11 insertions(+), 0 deletions(-)
++ create mode 100644 lisp/site-init.el
++
++diff --git a/lisp/site-init.el b/lisp/site-init.el
++new file mode 100644
++index 0000000..d8d6256
++--- /dev/null
+++++ b/lisp/site-init.el
++@@ -0,0 +1,11 @@
+++
+++;; Add the flavor specific directory for Debian.
+++(setq Info-default-directory-list
+++ (let ((result nil)
+++ (found-match nil))
+++ (dolist (elt Info-default-directory-list (nreverse result))
+++ (if (and (not found-match) (equal elt "/usr/share/info/"))
+++ (progn
+++ (push "/usr/share/info/emacs-23" result)
+++ (setq found-match t)))
+++ (push elt result))))
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From f7fa7cb4f30ec7cb083d046300850a2900fd95f3 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:22 -0500
++Subject: debian-startup.diff
++ * Emacs runs debian-startup and sets debian-emacs-flavor.
++ Patch: debian-startup.diff
++
++ * Emacs runs debian-startup during the startup process unless
++ site-run-file is false.
++
++ * The global variable debian-emacs-flavor is bound to 'emacs23.
++ Author: Rob Browning <rlb@defaultvalue.org>
++---
++ lisp/startup.el | 21 +++++++++++++++++++--
++ 1 files changed, 19 insertions(+), 2 deletions(-)
++
++diff --git a/lisp/startup.el b/lisp/startup.el
++index 87f1a00..cffc24a 100644
++--- a/lisp/startup.el
+++++ b/lisp/startup.el
++@@ -393,6 +393,10 @@ Warning Warning!!! Pure space overflow !!!Warning Warning
++ :type 'directory
++ :initialize 'custom-initialize-delay)
++
+++(defconst debian-emacs-flavor 'emacs23
+++ "A symbol representing the particular debian flavor of emacs running.
+++Something like 'emacs20, 'xemacs20, etc.")
+++
++ (defun normal-top-level-add-subdirs-to-load-path ()
++ "Add all subdirectories of current directory to `load-path'.
++ More precisely, this uses only the subdirectories whose names
++@@ -955,8 +959,21 @@ opening the first frame (e.g. open a connection to an X server).")
++ ;; be loaded from site-run-file and wants to test if -q was given
++ ;; should check init-file-user instead, since that is already set.
++ ;; See cus-edit.el for an example.
++- (if site-run-file
++- (load site-run-file t t))
+++
+++ ;; Original upstream startup
+++ ;; (if site-run-file
+++ ;; (load site-run-file t t))
+++ ;;
+++
+++ ;; Debian startup
+++ (if site-run-file
+++ (progn
+++ ;; Load all the debian package snippets.
+++ ;; It's in here because we want -q to kill it too.
+++ (if (load "debian-startup" t t nil)
+++ (debian-startup debian-emacs-flavor))
+++ ;; Now the normal site file...
+++ (load site-run-file t t nil)))
++
++ ;; Sites should not disable this. Only individuals should disable
++ ;; the startup screen.
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From e52b203a707fbe5471c8a222e5f2dc49cd8c5710 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:24 -0500
++Subject: handle-dfsg-split.diff
++ * Files apparently incompatible with the DFSG have been removed.
++
++ A number of files have been removed from this package because their
++ licenses are not compatible with the Debian Free Software Guidelines
++ (DFSG), or because it wasn't completely clear that their licenses
++ are compatible.
++
++ In particular, all of the files which are covered under the GFDL and
++ have invariant sections have been removed in accordance with this
++ General Resolution: http://www.debian.org/vote/2006/vote_001.
++
++ The files that have been removed, but still appear to be
++ distributable, have been moved to packages in Debian's non-free
++ section.
++
++ Patch: handle-dfsg-split.diff
++ Author: Rob Browning <rlb@defaultvalue.org>
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: new
++---
++ Makefile.in | 30 +---
++ configure.in | 4 +-
++ doc/misc/Makefile.in | 490 +-------------------------------------------------
++ lisp/help.el | 10 +-
++ 4 files changed, 16 insertions(+), 518 deletions(-)
++
++diff --git a/Makefile.in b/Makefile.in
++index 4c869ce..d8b9d30 100644
++--- a/Makefile.in
+++++ b/Makefile.in
++@@ -139,12 +139,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
++ # since there are now many packages documented with the texinfo
++ # system, it is inappropriate to imply that it is part of Emacs.
++ infodir=@infodir@
++-INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \
++- ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
++- eshell eudc flymake forms gnus idlwave info mairix-el \
++- message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \
++- reftex remember sasl sc semantic ses sieve smtpmail speedbar \
++- tramp url vip viper widget woman
+++INFO_FILES=efaq
++
++ # Directory for local state files for all programs.
++ localstatedir=@localstatedir@
++@@ -270,7 +265,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
++ SUBDIR = lib-src src lisp
++
++ # The subdir makefiles created by config.status.
++-SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
+++SUBDIR_MAKEFILES = lib-src/Makefile doc/misc/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
++
++ # Subdirectories to install, and where they'll go.
++ # lib-src's makefile knows how to install it, so we don't do that here.
++@@ -357,10 +352,7 @@ Makefile: config.status $(srcdir)/src/config.in \
++ $(srcdir)/Makefile.in \
++ $(srcdir)/src/Makefile.in \
++ $(srcdir)/lib-src/Makefile.in \
++- $(srcdir)/doc/emacs/Makefile.in \
++ $(srcdir)/doc/misc/Makefile.in \
++- $(srcdir)/doc/lispref/Makefile.in \
++- $(srcdir)/doc/lispintro/Makefile.in \
++ $(srcdir)/oldXMenu/Makefile.in \
++ $(srcdir)/lwlib/Makefile.in \
++ $(srcdir)/leim/Makefile.in \
++@@ -701,10 +693,7 @@ mostlyclean: FRC
++ (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
++ (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
++ (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
++- -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
++ -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
++- -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
++- -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean)
++ (cd leim; $(MAKE) $(MFLAGS) mostlyclean)
++
++ ### `clean'
++@@ -720,10 +709,7 @@ clean: FRC
++ (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
++ (cd lwlib; $(MAKE) $(MFLAGS) clean)
++ (cd lib-src; $(MAKE) $(MFLAGS) clean)
++- -(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
++ -(cd doc/misc && $(MAKE) $(MFLAGS) clean)
++- -(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
++- -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
++ (cd leim; $(MAKE) $(MFLAGS) clean)
++
++ ### `bootclean'
++@@ -744,10 +730,7 @@ distclean: FRC
++ (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
++ (cd lwlib; $(MAKE) $(MFLAGS) distclean)
++ (cd lib-src; $(MAKE) $(MFLAGS) distclean)
++- (cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
++ (cd doc/misc && $(MAKE) $(MFLAGS) distclean)
++- (cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
++- (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean)
++ (cd leim; $(MAKE) $(MFLAGS) distclean)
++ (cd lisp; $(MAKE) $(MFLAGS) distclean)
++ ${top_distclean}
++@@ -760,10 +743,7 @@ bootstrap-clean: FRC
++ (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
++ (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
++ (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
++- -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
++ -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
++- -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)
++- -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
++ (cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
++ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
++ ${top_bootclean}
++@@ -808,10 +788,7 @@ dist:
++ .PHONY: info dvi dist check html
++
++ info-real:
++- (cd doc/emacs; $(MAKE) $(MFLAGS) info)
++ (cd doc/misc; $(MAKE) $(MFLAGS) info)
++- (cd doc/lispref; $(MAKE) $(MFLAGS) info)
++- (cd doc/lispintro; $(MAKE) $(MFLAGS) info)
++
++ force-info:
++ # Note that man/Makefile knows how to put the info files in $(srcdir),
++@@ -850,10 +827,7 @@ check-info-dir: info
++ echo "info/dir is OK"
++
++ dvi:
++- (cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
++ (cd doc/misc; $(MAKE) $(MFLAGS) dvi)
++- (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
++- (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
++
++ #### Bootstrapping.
++
++diff --git a/configure.in b/configure.in
++index 6ed1466..d3dc403 100644
++--- a/configure.in
+++++ b/configure.in
++@@ -3087,8 +3087,8 @@ AC_EGREP_CPP(yes..yes,
++ CPP_NEED_TRADITIONAL=yes)
++
++ AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
++- doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
++- doc/lispref/Makefile src/Makefile.c:src/Makefile.in \
+++ doc/misc/Makefile \
+++ src/Makefile.c:src/Makefile.in \
++ lwlib/Makefile lisp/Makefile leim/Makefile, [
++
++ ### Make the necessary directories, if they don't exist.
++diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
++index 18d9d9a..8702dec 100644
++--- a/doc/misc/Makefile.in
+++++ b/doc/misc/Makefile.in
++@@ -38,104 +38,10 @@ MAKEINFO = makeinfo --force
++
++ # Also add new entries to INFO_FILES in the top-level Makefile.in.
++ INFO_TARGETS = \
++- $(infodir)/ada-mode \
++- $(infodir)/auth \
++- $(infodir)/autotype \
++- $(infodir)/calc \
++- $(infodir)/ccmode \
++- $(infodir)/cl \
++- $(infodir)/dbus \
++- $(infodir)/dired-x \
++- $(infodir)/ebrowse \
++- $(infodir)/ede \
++- $(infodir)/ediff \
++- $(infodir)/edt \
++- $(infodir)/eieio \
++- $(infodir)/emacs-mime \
++- $(infodir)/epa \
++- $(infodir)/erc \
++- $(infodir)/eshell \
++- $(infodir)/eudc \
++- $(infodir)/efaq \
++- $(infodir)/flymake \
++- $(infodir)/forms \
++- $(infodir)/gnus \
++- $(infodir)/idlwave \
++- $(infodir)/info \
++- $(infodir)/mairix-el \
++- $(infodir)/message \
++- $(infodir)/mh-e \
++- $(infodir)/newsticker \
++- $(infodir)/nxml-mode \
++- $(infodir)/org \
++- $(infodir)/pcl-cvs \
++- $(infodir)/pgg \
++- $(infodir)/rcirc \
++- $(infodir)/remember \
++- $(infodir)/reftex \
++- $(infodir)/sasl \
++- $(infodir)/sc \
++- $(infodir)/semantic \
++- $(infodir)/ses \
++- $(infodir)/sieve \
++- $(infodir)/smtpmail \
++- $(infodir)/speedbar \
++- $(infodir)/tramp \
++- $(infodir)/url \
++- $(infodir)/vip \
++- $(infodir)/viper \
++- $(infodir)/widget \
++- $(infodir)/woman
+++ $(infodir)/efaq
++
++ DVI_TARGETS = \
++- ada-mode.dvi \
++- auth.dvi \
++- autotype.dvi \
++- calc.dvi \
++- cc-mode.dvi \
++- cl.dvi \
++- dbus.dvi \
++- dired-x.dvi \
++- ebrowse.dvi \
++- ede.dvi \
++- ediff.dvi \
++- edt.dvi \
++- eieio.dvi \
++- emacs-mime.dvi \
++- epa.dvi \
++- erc.dvi \
++- eshell.dvi \
++- eudc.dvi \
++- faq.dvi \
++- flymake.dvi \
++- forms.dvi \
++- gnus.dvi \
++- idlwave.dvi \
++- info.dvi \
++- mairix-el.dvi \
++- message.dvi \
++- mh-e.dvi \
++- newsticker.dvi \
++- nxml-mode.dvi \
++- org.dvi \
++- pcl-cvs.dvi \
++- pgg.dvi \
++- rcirc.dvi \
++- reftex.dvi \
++- remember.dvi \
++- sasl.dvi \
++- sc.dvi \
++- semantic.dvi \
++- ses.dvi \
++- sieve.dvi \
++- smtpmail.dvi \
++- speedbar.dvi \
++- tramp.dvi \
++- url.dvi \
++- vip.dvi \
++- viper.dvi \
++- widget.dvi \
++- woman.dvi
+++ faq.dvi
++
++ PDF_TARGETS = \
++ ada-mode.pdf \
++@@ -198,10 +104,7 @@ TEXI2PDF = texi2pdf
++ ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
++
++
++-info: $(infodir) $(INFO_TARGETS)
++-
++-$(infodir):
++- mkdir $@
+++info: $(INFO_TARGETS)
++
++ dvi: $(DVI_TARGETS)
++
++@@ -213,150 +116,6 @@ pdf: $(PDF_TARGETS)
++ # In a distribution of Emacs, the Info files should be up to date.
++
++ ## "short" target names for convenience, to just rebuild one manual.
++-ada-mode : $(infodir)/ada-mode
++-$(infodir)/ada-mode: ada-mode.texi
++- cd $(srcdir); $(MAKEINFO) ada-mode.texi
++-ada-mode.dvi: ada-mode.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
++-ada-mode.pdf: ada-mode.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
++-
++-auth : $(infodir)/auth
++-$(infodir)/auth: auth.texi
++- cd $(srcdir); $(MAKEINFO) auth.texi
++-auth.dvi: auth.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
++-auth.pdf: auth.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
++-
++-autotype : $(infodir)/autotype
++-$(infodir)/autotype: autotype.texi
++- cd $(srcdir); $(MAKEINFO) autotype.texi
++-autotype.dvi: autotype.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
++-autotype.pdf: autotype.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
++-
++-calc : $(infodir)/calc
++-$(infodir)/calc: calc.texi
++- cd $(srcdir); $(MAKEINFO) calc.texi
++-calc.dvi: calc.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
++-calc.pdf: calc.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
++-
++-ccmode : $(infodir)/ccmode
++-$(infodir)/ccmode: cc-mode.texi
++- cd $(srcdir); $(MAKEINFO) cc-mode.texi
++-cc-mode.dvi: cc-mode.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
++-cc-mode.pdf: cc-mode.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
++-
++-cl : $(infodir)/cl
++-$(infodir)/cl: cl.texi
++- cd $(srcdir); $(MAKEINFO) cl.texi
++-cl.dvi: cl.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
++-cl.pdf: cl.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
++-
++-dbus : $(infodir)/dbus
++-$(infodir)/dbus: dbus.texi
++- cd $(srcdir); $(MAKEINFO) dbus.texi
++-dbus.dvi: dbus.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
++-dbus.pdf: dbus.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
++-
++-dired-x : $(infodir)/dired-x
++-$(infodir)/dired-x: dired-x.texi
++- cd $(srcdir); $(MAKEINFO) dired-x.texi
++-dired-x.dvi: dired-x.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
++-dired-x.pdf: dired-x.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
++-
++-ebrowse : $(infodir)/ebrowse
++-$(infodir)/ebrowse: ebrowse.texi
++- cd $(srcdir); $(MAKEINFO) ebrowse.texi
++-ebrowse.dvi: ebrowse.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
++-ebrowse.pdf: ebrowse.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
++-
++-ede : $(infodir)/ede
++-$(infodir)/ede: ede.texi
++- cd $(srcdir); $(MAKEINFO) ede.texi
++-ede.dvi: ede.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
++-ede.pdf: ede.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
++-
++-ediff : $(infodir)/ediff
++-$(infodir)/ediff: ediff.texi
++- cd $(srcdir); $(MAKEINFO) ediff.texi
++-ediff.dvi: ediff.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
++-ediff.pdf: ediff.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
++-
++-edt : $(infodir)/edt
++-$(infodir)/edt: edt.texi
++- cd $(srcdir); $(MAKEINFO) edt.texi
++-edt.dvi: edt.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
++-edt.pdf: edt.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
++-
++-eieio : $(infodir)/eieio
++-$(infodir)/eieio: eieio.texi
++- cd $(srcdir); $(MAKEINFO) eieio.texi
++-eieio.dvi: eieio.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
++-eieio.pdf: eieio.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
++-
++-emacs-mime : $(infodir)/emacs-mime
++-$(infodir)/emacs-mime: emacs-mime.texi
++- cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
++-emacs-mime.dvi: emacs-mime.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
++-emacs-mime.pdf: emacs-mime.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
++-
++-epa : $(infodir)/epa
++-$(infodir)/epa: epa.texi
++- cd $(srcdir); $(MAKEINFO) epa.texi
++-epa.dvi: epa.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
++-epa.pdf: epa.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
++-
++-erc : $(infodir)/erc
++-$(infodir)/erc: erc.texi
++- cd $(srcdir); $(MAKEINFO) erc.texi
++-erc.dvi: erc.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
++-erc.pdf: erc.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
++-
++-eshell : $(infodir)/eshell
++-$(infodir)/eshell: eshell.texi
++- cd $(srcdir); $(MAKEINFO) eshell.texi
++-eshell.dvi: eshell.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
++-eshell.pdf: eshell.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
++-
++-eudc : $(infodir)/eudc
++-$(infodir)/eudc: eudc.texi
++- cd $(srcdir); $(MAKEINFO) eudc.texi
++-eudc.dvi: eudc.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
++-eudc.pdf: eudc.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
++-
++ efaq : $(infodir)/efaq
++ $(infodir)/efaq: faq.texi
++ cd $(srcdir); $(MAKEINFO) faq.texi
++@@ -365,249 +124,6 @@ faq.dvi: faq.texi
++ faq.pdf: faq.texi
++ $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
++
++-flymake : $(infodir)/flymake
++-$(infodir)/flymake: flymake.texi
++- cd $(srcdir); $(MAKEINFO) flymake.texi
++-flymake.dvi: flymake.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
++-flymake.pdf: flymake.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
++-
++-forms : $(infodir)/forms
++-$(infodir)/forms: forms.texi
++- cd $(srcdir); $(MAKEINFO) forms.texi
++-forms.dvi: forms.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
++-forms.pdf: forms.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
++-
++-# gnus/message/emacs-mime/sieve/pgg are part of Gnus:
++-gnus : $(infodir)/gnus
++-$(infodir)/gnus: gnus.texi gnus-faq.texi
++- cd $(srcdir); $(MAKEINFO) gnus.texi
++-gnus.dvi: gnus.texi gnus-faq.texi
++- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
++- $(ENVADD) $(TEXI2DVI) gnustmp.texi
++- cp gnustmp.dvi $*.dvi
++- rm gnustmp.*
++-gnus.pdf: gnus.texi gnus-faq.texi
++- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
++- $(ENVADD) $(TEXI2PDF) gnustmp.texi
++- cp gnustmp.pdf $@
++- rm gnustmp.*
++-
++-# This is produced with --no-split to avoid making files whose
++-# names clash on DOS 8+3 filesystems
++-idlwave : $(infodir)/idlwave
++-$(infodir)/idlwave: idlwave.texi
++- cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
++-idlwave.dvi: idlwave.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
++-idlwave.pdf: idlwave.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
++-
++-# The following target uses an explicit -o switch to work around
++-# the @setfilename directive in info.texi, which is required for
++-# the Texinfo distribution.
++-###info : $(infodir)/info # circular!
++-$(infodir)/info: info.texi
++- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
++-info.dvi: info.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
++-info.pdf: info.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
++-
++-mairix-el : $(infodir)/mairix-el
++-$(infodir)/mairix-el: mairix-el.texi
++- cd $(srcdir); $(MAKEINFO) mairix-el.texi
++-mairix-el.dvi: mairix-el.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
++-mairix-el.pdf: mairix-el.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
++-
++-message : $(infodir)/message
++-$(infodir)/message: message.texi
++- cd $(srcdir); $(MAKEINFO) message.texi
++-message.dvi: message.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
++-message.pdf: message.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
++-
++-mh-e : $(infodir)/mh-e
++-$(infodir)/mh-e: mh-e.texi
++- cd $(srcdir); $(MAKEINFO) mh-e.texi
++-mh-e.dvi: mh-e.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
++-mh-e.pdf: mh-e.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
++-
++-newsticker : $(infodir)/newsticker
++-$(infodir)/newsticker: newsticker.texi
++- cd $(srcdir); $(MAKEINFO) newsticker.texi
++-newsticker.dvi: newsticker.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
++-newsticker.pdf: newsticker.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
++-
++-nxml-mode : $(infodir)/nxml-mode
++-$(infodir)/nxml-mode: nxml-mode.texi
++- cd $(srcdir); $(MAKEINFO) nxml-mode.texi
++-nxml-mode.dvi: nxml-mode.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
++-nxml-mode.pdf: nxml-mode.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
++-
++-org : $(infodir)/org
++-$(infodir)/org: org.texi
++- cd $(srcdir); $(MAKEINFO) org.texi
++-org.dvi: org.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
++-org.pdf: org.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
++-
++-pcl-cvs : $(infodir)/pcl-cvs
++-$(infodir)/pcl-cvs: pcl-cvs.texi
++- cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
++-pcl-cvs.dvi: pcl-cvs.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
++-pcl-cvs.pdf: pcl-cvs.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
++-
++-pgg : $(infodir)/pgg
++-$(infodir)/pgg: pgg.texi
++- cd $(srcdir); $(MAKEINFO) pgg.texi
++-pgg.dvi: pgg.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
++-pgg.pdf: pgg.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
++-
++-rcirc : $(infodir)/rcirc
++-$(infodir)/rcirc: rcirc.texi
++- cd $(srcdir); $(MAKEINFO) rcirc.texi
++-rcirc.dvi: rcirc.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
++-rcirc.pdf: rcirc.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
++-
++-reftex : $(infodir)/reftex
++-$(infodir)/reftex: reftex.texi
++- cd $(srcdir); $(MAKEINFO) reftex.texi
++-reftex.dvi: reftex.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
++-reftex.pdf: reftex.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
++-
++-remember : $(infodir)/remember
++-$(infodir)/remember: remember.texi
++- cd $(srcdir); $(MAKEINFO) remember.texi
++-remember.dvi: remember.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
++-remember.pdf: remember.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
++-
++-sasl : $(infodir)/sasl
++-$(infodir)/sasl: sasl.texi
++- cd $(srcdir); $(MAKEINFO) sasl.texi
++-sasl.dvi: sasl.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
++-sasl.pdf: sasl.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
++-
++-sc : $(infodir)/sc
++-$(infodir)/sc: sc.texi
++- cd $(srcdir); $(MAKEINFO) sc.texi
++-sc.dvi: sc.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
++-sc.pdf: sc.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
++-
++-semantic : $(infodir)/semantic
++-$(infodir)/semantic: semantic.texi sem-user.texi
++- cd $(srcdir); $(MAKEINFO) semantic.texi
++-semantic.dvi: semantic.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
++-semantic.pdf: semantic.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
++-
++-ses : $(infodir)/ses
++-$(infodir)/ses: ses.texi
++- cd $(srcdir); $(MAKEINFO) ses.texi
++-ses.dvi: ses.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
++-ses.pdf: ses.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
++-
++-sieve : $(infodir)/sieve
++-$(infodir)/sieve: sieve.texi
++- cd $(srcdir); $(MAKEINFO) sieve.texi
++-sieve.dvi: sieve.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
++-sieve.pdf: sieve.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
++-
++-smtpmail : $(infodir)/smtpmail
++-$(infodir)/smtpmail: smtpmail.texi
++- cd $(srcdir); $(MAKEINFO) smtpmail.texi
++-smtpmail.dvi: smtpmail.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
++-smtpmail.pdf: smtpmail.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
++-
++-speedbar : $(infodir)/speedbar
++-$(infodir)/speedbar: speedbar.texi
++- cd $(srcdir); $(MAKEINFO) speedbar.texi
++-speedbar.dvi: speedbar.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
++-speedbar.pdf: speedbar.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
++-
++-tramp : $(infodir)/tramp
++-$(infodir)/tramp: tramp.texi trampver.texi
++- cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
++-tramp.dvi: tramp.texi trampver.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
++-tramp.pdf: tramp.texi trampver.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
++-
++-url : $(infodir)/url
++-$(infodir)/url: url.texi
++- cd $(srcdir); $(MAKEINFO) url.texi
++-url.dvi: url.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
++-url.pdf: url.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
++-
++-vip : $(infodir)/vip
++-$(infodir)/vip: vip.texi
++- cd $(srcdir); $(MAKEINFO) vip.texi
++-vip.dvi: vip.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
++-vip.pdf: vip.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
++-
++-viper : $(infodir)/viper
++-$(infodir)/viper: viper.texi
++- cd $(srcdir); $(MAKEINFO) viper.texi
++-viper.dvi: viper.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
++-viper.pdf: viper.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
++-
++-widget : $(infodir)/widget
++-$(infodir)/widget: widget.texi
++- cd $(srcdir); $(MAKEINFO) widget.texi
++-widget.dvi: widget.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
++-widget.pdf: widget.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
++-
++-woman : $(infodir)/woman
++-$(infodir)/woman: woman.texi
++- cd $(srcdir); $(MAKEINFO) woman.texi
++-woman.dvi: woman.texi
++- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
++-woman.pdf: woman.texi
++- $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
++
++
++ mostlyclean:
++diff --git a/lisp/help.el b/lisp/help.el
++index 0c231a7..9a05e6d 100644
++--- a/lisp/help.el
+++++ b/lisp/help.el
++@@ -301,6 +301,14 @@ If that doesn't give a function, return nil."
++ (goto-address-mode 1)
++ (goto-char (point-min)))
++
+++(defun debian-expand-file-name-dfsg (filename)
+++ "Apply expand-file-name to FILENAME.
+++If expand-file-name does not find a file, append `.dfsg' and try again."
+++ (let ((file (expand-file-name filename data-directory)))
+++ (if (file-exists-p file)
+++ file
+++ (expand-file-name (concat file ".dfsg") data-directory))))
+++
++ (defun describe-distribution ()
++ "Display info on how to obtain the latest version of GNU Emacs."
++ (interactive)
++@@ -314,7 +322,7 @@ If that doesn't give a function, return nil."
++ (defun describe-gnu-project ()
++ "Display info on the GNU project."
++ (interactive)
++- (view-help-file "THE-GNU-PROJECT"))
+++ (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT")))
++
++ (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
++
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 6560c555b4fdd8c119585413b6139b219701c833 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:25 -0500
++Subject: misc-unseparated.diff
++ * The following miscellaneous changes have been made.
++ Patch: misc-unseparated.diff
++
++ * Various documentation references have been adjusted for Debian.
++
++ References to /usr/local/... have been changed to
++ /usr/... as appropriate, etc.
++---
++ etc/NEWS | 5 +++++
++ 1 files changed, 5 insertions(+), 0 deletions(-)
++
++diff --git a/etc/NEWS b/etc/NEWS
++index b52b1f7..c5709a8 100644
++--- a/etc/NEWS
+++++ b/etc/NEWS
++@@ -14,6 +14,11 @@ for changes in older Emacs versions.
++ You can narrow news to a specific version by calling `view-emacs-news'
++ with a prefix argument or by typing C-u C-h C-n.
++
+++ \f
+++* Debian specific changes to Emacs
+++
+++Please see /usr/share/doc/emacs23-common/README.Debian.gz.
+++
++ \f
++ * Installation Changes in Emacs 23.2
++
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 21dcfe7f1106d4d04daec7ff51791406615451bd Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:26 -0500
++Subject: require-movemail-use-liblockfile.diff
++ * The build will fail if liblockfile isn't selected for movemail.
++ Patch: require-movemail-use-liblockfile.diff
++ Author: Rob Browning <rlb@defaultvalue.org>
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++
++ This makes sure the Debian Emacs won't accidentally be built with
++ the wrong locking strategy. To disable this check, comment out
++ require-movemail-use-liblockfile.diff in debian/patches/series.
++---
++ lib-src/movemail.c | 4 ++++
++ src/s/bsd-common.h | 4 ++++
++ 2 files changed, 8 insertions(+), 0 deletions(-)
++
++diff --git a/lib-src/movemail.c b/lib-src/movemail.c
++index ae51df3..7c8cfff 100644
++--- a/lib-src/movemail.c
+++++ b/lib-src/movemail.c
++@@ -166,6 +166,10 @@ int mbx_delimit_end ();
++ /* Nonzero means this is name of a lock file to delete on fatal error. */
++ char *delete_lockname;
++
+++#ifndef MAIL_USE_MAILLOCK
+++#error "Debian requires that mail locking be handled by liblockfile."
+++#endif /* ndef MAIL_USE_MAILLOCK */
+++
++ int
++ main (argc, argv)
++ int argc;
++diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
++index 8094f50..fd0eb1a 100644
++--- a/src/s/bsd-common.h
+++++ b/src/s/bsd-common.h
++@@ -66,7 +66,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
++ The alternative is that a lock file named
++ /usr/spool/mail/$USER.lock. */
++
+++/* conditional copied from gnu-linux.h */
+++#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \
+++ defined (HAVE_MAILLOCK_H))
++ #define MAIL_USE_FLOCK
+++#endif
++
++ /* Define CLASH_DETECTION if you want lock files to be written
++ so that Emacs can tell instantly when you try to modify
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From eb373e1c4659501ff060cd1ef98c1564baa4cc6a Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:27 -0500
++Subject: avoid-fakemail-mail-loss.diff
++ * An attempt is made to avoid silently losing mail via fakemail.
++ Patch: avoid-fakemail-mail-loss.diff
++ Author: Rob Browning <rlb@defaultvalue.org>
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++
++ This fix attempts to avoid a situation where Emacs can silently lose
++ mail. This can occur if sendmail.el (at least) falls back to
++ fakemail, and the underlying binary (MAIL_PROGRAM_NAME) that
++ fakemail is configured to use doesn't exist. Unless
++ mail-interactive is true, Emacs won't wait for the mailer and so
++ won't know that fakemail failed.
++
++ For now, Debian sets fakemail's MAIL_PROGRAM_NAME to /usr/bin/mail
++ (which is the correct value for Debian systems) rather than
++ /bin/mail. Debian also adjusts Emacs to test whether or not
++ /usr/bin/mail exists and is executable. If either of these tests
++ fail, then mail-interactive is set to t. That should ensure that a
++ user will actually see an error if they attempt to use the broken
++ fakemail.
++
++ Note that Debian actually forces the MAIL_PROGRAM_NAME value to
++ /usr/bin/mail. The build will fail if any other value is specified.
++ This is done to ensure that MAIL_PROGRAM_NAME isn't accidentally set
++ to some other value during the build process. If this is
++ undesirable for some reason, just comment out
++ avoid-fakemail-loss.diff in debian/patches/series.
++---
++ lib-src/fakemail.c | 6 ++++--
++ lisp/gnus/message.el | 8 +++++++-
++ lisp/mail/feedmail.el | 7 ++++++-
++ lisp/mail/sendmail.el | 7 ++++++-
++ 4 files changed, 23 insertions(+), 5 deletions(-)
++
++diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
++index f98fb74..9f81fa6 100644
++--- a/lib-src/fakemail.c
+++++ b/lib-src/fakemail.c
++@@ -136,8 +136,10 @@ struct linebuffer lb;
++ #define NIL ((line_list) NULL)
++ #define INITIAL_LINE_SIZE 200
++
++-#ifndef MAIL_PROGRAM_NAME
++-#define MAIL_PROGRAM_NAME "/bin/mail"
+++#ifdef MAIL_PROGRAM_NAME
+++#error "Debian assumption violated -- see avoid-fakemail-mail-loss.diff"
+++#else
+++#define MAIL_PROGRAM_NAME "/usr/bin/mail"
++ #endif
++
++ static char *my_name;
++diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
++index 2fe8a4d..dd230ba 100644
++--- a/lisp/gnus/message.el
+++++ b/lisp/gnus/message.el
++@@ -4589,7 +4589,13 @@ If you always want Gnus to send messages in one piece, set
++ "/usr/lib/sendmail")
++ ((file-exists-p "/usr/ucblib/sendmail")
++ "/usr/ucblib/sendmail")
++- (t "fakemail"))
+++ (t
+++ (if (not (file-executable-p
+++ "/usr/bin/mail"))
+++ (progn
+++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
+++ (setq mail-interactive t)))
+++ "fakemail"))
++ nil errbuf nil "-oi")
++ message-sendmail-extra-arguments
++ ;; Always specify who from,
++diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
++index 77d82f6..29cc891 100644
++--- a/lisp/mail/feedmail.el
+++++ b/lisp/mail/feedmail.el
++@@ -1327,7 +1327,12 @@ complicated cases."
++ "/usr/lib/sendmail")
++ ((file-exists-p "/usr/ucblib/sendmail")
++ "/usr/ucblib/sendmail")
++- (t "fakemail"))
+++ (t
+++ (if (not (file-executable-p "/usr/bin/mail"))
+++ (progn
+++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
+++ (setq mail-interactive t)))
+++ "fakemail"))
++ nil errors-to nil "-oi" "-t")
++ ;; provide envelope "from" to sendmail; results will vary
++ (list "-f" user-mail-address)
++diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
++index 3cc1bf5..1ad1add 100644
++--- a/lisp/mail/sendmail.el
+++++ b/lisp/mail/sendmail.el
++@@ -52,7 +52,12 @@
++ ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
++ ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
++ ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
++- (t "fakemail")) ;In ../etc, to interface to /bin/mail.
+++ (t
+++ (if (not (file-executable-p "/usr/bin/mail"))
+++ (progn
+++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
+++ (setq mail-interactive t)))
+++ "fakemail")) ;In ../etc, to interface to /bin/mail.
++ "Program used to send messages."
++ :group 'mail
++ :type 'file)
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 88bc44880a30d9ecd2b647135d9a74728c1a80c4 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:28 -0500
++Subject: version-mention-debian.diff
++ * The output of (version) has been modified to indicate Debian modifications.
++ Patch: version-mention-debian.diff
++ Author: Rob Browning <rlb@defaultvalue.org>
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++
++---
++ lisp/version.el | 4 ++--
++ 1 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/lisp/version.el b/lisp/version.el
++index bc9ff1b..407c0c6 100644
++--- a/lisp/version.el
+++++ b/lisp/version.el
++@@ -56,8 +56,8 @@ to the system configuration; look at `system-configuration' instead."
++ (interactive "P")
++ (let ((version-string
++ (format (if (not (called-interactively-p 'interactive))
++- "GNU Emacs %s (%s%s%s)\n of %s on %s"
++- "GNU Emacs %s (%s%s%s) of %s on %s")
+++ "GNU Emacs %s (%s%s%s)\n of %s on %s, modified by Debian"
+++ "GNU Emacs %s (%s%s%s) of %s on %s, modified by Debian")
++ emacs-version
++ system-configuration
++ (cond ((featurep 'motif)
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 54f455e8c716134bac7c4ea3ba3fc566dd13bbd6 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:29 -0500
++Subject: look-for-news-to-find-etc.diff
++ * Emacs will now look for NEWS in order to find etc/ rather than GNU.
++ Patch: look-for-news-to-find-etc.diff
++ Provided-by: Sven Joachim <svenjoac@gmx.de>
++ Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
++ Date: Mon, 28 Apr 2008 11:20:23 +0200
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: Debian specific
++
++ Since Debian doesn't include GNU in the Debian packages (the common
++ licenses are in /usr/share/common-licenses), Emacs will now look for
++ NEWS to find the etc directory instead of GNU.
++---
++ src/callproc.c | 4 ++--
++ 1 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/src/callproc.c b/src/callproc.c
++index bed3302..7b259f0 100644
++--- a/src/callproc.c
+++++ b/src/callproc.c
++@@ -1518,14 +1518,14 @@ init_callproc ()
++
++ srcdir = Fexpand_file_name (build_string ("../src/"),
++ build_string (PATH_DUMPLOADSEARCH));
++- tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
+++ tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
++ tem1 = Ffile_exists_p (tem);
++ if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
++ {
++ Lisp_Object newdir;
++ newdir = Fexpand_file_name (build_string ("../etc/"),
++ build_string (PATH_DUMPLOADSEARCH));
++- tem = Fexpand_file_name (build_string ("GNU"), newdir);
+++ tem = Fexpand_file_name (build_string ("NEWS"), newdir);
++ tem1 = Ffile_exists_p (tem);
++ if (!NILP (tem1))
++ Vdata_directory = newdir;
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 9bb4b35ea4a708b4740057fd4bce812407a2743d Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:30 -0500
++Subject: fix-flymake-xmlstarlet-invocation.diff
++ * Emacs now invokes the correct xmlstarlet executable on Debian systems.
++ Patch: fix-flymake-xmlstarlet-invocation.diff
++ Provided-by: Jussi Judin <jjudin+debian@iki.fi>
++ Date: Sat, 20 Oct 2007 14:42:02 UTC
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: Debian specific
++ Bug: 447378
++
++ Emacs invokes xmlstarlet rather than xml, which is the correct
++ executable name on Debian systems.
++---
++ lisp/progmodes/flymake.el | 2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
++index 2a19821..0fdfe54 100644
++--- a/lisp/progmodes/flymake.el
+++++ b/lisp/progmodes/flymake.el
++@@ -1759,7 +1759,7 @@ Use CREATE-TEMP-F for creating temp copy."
++
++ ;;;; xml-specific init-cleanup routines
++ (defun flymake-xml-init ()
++- (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
+++ (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
++
++ (provide 'flymake)
++
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From f5c912bee9fabdfa4d2d797cc9167ebe55d9ad35 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:31 -0500
++Subject: add-unix-to-cpp-undefs.diff
++ * ./configure should no longer define "unix" when building Emacs.
++ Patch: add-unix-to-cpp-undefs.diff
++ Date: Sun May 2 07:23:27 UTC 2010
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ Before this fix, gcc would produce the following warning:
++
++ gcc: unrecognized option '-2.0/'
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 99984
++ committer: Miles Bader <miles@gnu.org>
++ branch nick: trunk
++ timestamp: Thu 2010-04-22 09:10:30 +0900
++ message:
++ get rid of "unix" pre-defined macro when preprocessing Makefile
++---
++ configure.in | 2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/configure.in b/configure.in
++index d3dc403..912a7da 100644
++--- a/configure.in
+++++ b/configure.in
++@@ -3072,7 +3072,7 @@ test "${exec_prefix}" != NONE &&
++ # the C preprocessor to some helpful value like 1, or maybe the empty
++ # string. Needless to say consequent macro substitutions are less
++ # than conducive to the makefile finding the correct directory.
++-[cpp_undefs="`echo $srcdir $configuration $canonical |
+++[cpp_undefs="`echo $srcdir $configuration $canonical unix |
++ sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
++ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"]
++
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 0e52273d87ebb74f7da776b9744ffca00ff358fd Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:32 -0500
++Subject: fix-gnu-kfreebsd-startup.diff
++ * Emacs should no longer hang on startup on Debian GNU/kFreeBSD.
++ Patch: fix-gnu-kfreebsd-startup.diff
++ Date: Thu Aug 12 04:21:09 UTC 2010
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Provided-By: Petr Salinger <Petr.Salinger@seznam.cz>
++ Bug: 559392
++ Status: new
++
++---
++ src/s/gnu-kfreebsd.h | 5 +++++
++ 1 files changed, 5 insertions(+), 0 deletions(-)
++
++diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
++index a1e8c02..89563de 100644
++--- a/src/s/gnu-kfreebsd.h
+++++ b/src/s/gnu-kfreebsd.h
++@@ -5,6 +5,11 @@
++ #undef SYSTEM_TYPE
++ #define SYSTEM_TYPE "gnu/kfreebsd" /* All the best software is free */
++
+++#undef INTERRUPT_INPUT
+++#define BROKEN_SIGIO
+++#define BROKEN_SIGURG
+++#define BROKEN_SIGPOLL
+++
++ #define NO_TERMIO /* use only <termios.h> */
++
++ /* arch-tag: 8d098200-2586-469e-99ab-6d092c035e03
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 6635438f25bd0f83ba3d8b1a48c88d630313efbe Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:33 -0500
++Subject: prevent-string-stack-overflow.diff
++ * The string and unibyte-string functions should no longer overflow the stack.
++ Patch: prevent-string-stack-overflow.diff
++ Provided-by: Carl Worth <cworth@debian.org>
++ Date: Sat, 19 Jun 2010 11:12:06 -0700
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 99634.2.173
++ committer: Chong Yidong <cyd@stupidchicken.com>
++ branch nick: emacs-23
++ timestamp: Tue 2010-05-18 14:01:10 -0400
++ message:
++ * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
++ prevent stack overflow if number of arguments is too large
++ (Bug#6214).
++---
++ src/ChangeLog | 6 ++++++
++ src/character.c | 30 ++++++++++++++++++++----------
++ 2 files changed, 26 insertions(+), 10 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index 7510a54..c27cc24 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -1,3 +1,9 @@
+++2010-05-18 Chong Yidong <cyd@stupidchicken.com>
+++
+++ * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
+++ prevent stack overflow if number of arguments is too large
+++ (Bug#6214).
+++
++ 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
++
++ * Version 23.2 released.
++diff --git a/src/character.c b/src/character.c
++index 5912a70..7cd1eed 100644
++--- a/src/character.c
+++++ b/src/character.c
++@@ -961,10 +961,13 @@ usage: (string &rest CHARACTERS) */)
++ int n;
++ Lisp_Object *args;
++ {
++- int i;
++- unsigned char *buf = (unsigned char *) alloca (MAX_MULTIBYTE_LENGTH * n);
++- unsigned char *p = buf;
++- int c;
+++ int i, c;
+++ unsigned char *buf, *p;
+++ Lisp_Object str;
+++ USE_SAFE_ALLOCA;
+++
+++ SAFE_ALLOCA (buf, unsigned char *, MAX_MULTIBYTE_LENGTH * n);
+++ p = buf;
++
++ for (i = 0; i < n; i++)
++ {
++@@ -973,7 +976,9 @@ usage: (string &rest CHARACTERS) */)
++ p += CHAR_STRING (c, p);
++ }
++
++- return make_string_from_bytes ((char *) buf, n, p - buf);
+++ str = make_string_from_bytes ((char *) buf, n, p - buf);
+++ SAFE_FREE ();
+++ return str;
++ }
++
++ DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0,
++@@ -983,10 +988,13 @@ usage: (unibyte-string &rest BYTES) */)
++ int n;
++ Lisp_Object *args;
++ {
++- int i;
++- unsigned char *buf = (unsigned char *) alloca (n);
++- unsigned char *p = buf;
++- unsigned c;
+++ int i, c;
+++ unsigned char *buf, *p;
+++ Lisp_Object str;
+++ USE_SAFE_ALLOCA;
+++
+++ SAFE_ALLOCA (buf, unsigned char *, n);
+++ p = buf;
++
++ for (i = 0; i < n; i++)
++ {
++@@ -997,7 +1005,9 @@ usage: (unibyte-string &rest BYTES) */)
++ *p++ = c;
++ }
++
++- return make_string_from_bytes ((char *) buf, n, p - buf);
+++ str = make_string_from_bytes ((char *) buf, n, p - buf);
+++ SAFE_FREE ();
+++ return str;
++ }
++
++ DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers,
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 52282e72d1f64823f2662f3c8e83d82e2535ae9f Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:34 -0500
++Subject: prevent-let-eval-apply-stack-overflow.diff
++ * A potential stack overflow should be fixed in let, eval, and apply.
++ Patch: prevent-let-eval-apply-stack-overflow.diff
++ Provided-by: Sven Joachim <svenjoac@gmx.de>
++ Date: Thu, 19 Aug 2010 21:24:11 +0200
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 99982
++ committer: Chong Yidong <cyd@stupidchicken.com>
++ branch nick: emacs-23
++ timestamp: Tue 2010-08-17 12:34:28 -0400
++ message:
++ Avoid stack overflow in let, eval, and apply (Bug#6214).
++
++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA (Bug#6214).
++---
++ src/ChangeLog | 5 +++++
++ src/eval.c | 31 ++++++++++++++++++++++---------
++ 2 files changed, 27 insertions(+), 9 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index c27cc24..ba78f95 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -1,3 +1,8 @@
+++2010-08-17 Chong Yidong <cyd@stupidchicken.com>
+++
+++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA
+++ (Bug#6214).
+++
++ 2010-05-18 Chong Yidong <cyd@stupidchicken.com>
++
++ * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
++diff --git a/src/eval.c b/src/eval.c
++index 6609d3b..7bd27a0 100644
++--- a/src/eval.c
+++++ b/src/eval.c
++@@ -1028,12 +1028,13 @@ usage: (let VARLIST BODY...) */)
++ int count = SPECPDL_INDEX ();
++ register int argnum;
++ struct gcpro gcpro1, gcpro2;
+++ USE_SAFE_ALLOCA;
++
++ varlist = Fcar (args);
++
++ /* Make space to hold the values to give the bound variables */
++ elt = Flength (varlist);
++- temps = (Lisp_Object *) alloca (XFASTINT (elt) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA (temps, Lisp_Object *, XFASTINT (elt) * sizeof (Lisp_Object));
++
++ /* Compute the values and store them in `temps' */
++
++@@ -1066,6 +1067,7 @@ usage: (let VARLIST BODY...) */)
++ }
++
++ elt = Fprogn (Fcdr (args));
+++ SAFE_FREE ();
++ return unbind_to (count, elt);
++ }
++
++@@ -2299,8 +2301,10 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
++ /* Pass a vector of evaluated arguments */
++ Lisp_Object *vals;
++ register int argnum = 0;
+++ USE_SAFE_ALLOCA;
++
++- vals = (Lisp_Object *) alloca (XINT (numargs) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA (vals, Lisp_Object *,
+++ XINT (numargs) * sizeof (Lisp_Object));
++
++ GCPRO3 (args_left, fun, fun);
++ gcpro3.var = vals;
++@@ -2318,6 +2322,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
++
++ val = (*XSUBR (fun)->function) (XINT (numargs), vals);
++ UNGCPRO;
+++ SAFE_FREE ();
++ goto done;
++ }
++
++@@ -2430,8 +2435,9 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
++ register int i, numargs;
++ register Lisp_Object spread_arg;
++ register Lisp_Object *funcall_args;
++- Lisp_Object fun;
+++ Lisp_Object fun, retval;
++ struct gcpro gcpro1;
+++ USE_SAFE_ALLOCA;
++
++ fun = args [0];
++ funcall_args = 0;
++@@ -2470,8 +2476,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
++ {
++ /* Avoid making funcall cons up a yet another new vector of arguments
++ by explicitly supplying nil's for optional values */
++- funcall_args = (Lisp_Object *) alloca ((1 + XSUBR (fun)->max_args)
++- * sizeof (Lisp_Object));
+++ SAFE_ALLOCA (funcall_args, Lisp_Object *,
+++ (1 + XSUBR (fun)->max_args) * sizeof (Lisp_Object));
++ for (i = numargs; i < XSUBR (fun)->max_args;)
++ funcall_args[++i] = Qnil;
++ GCPRO1 (*funcall_args);
++@@ -2483,8 +2489,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
++ function itself as well as its arguments. */
++ if (!funcall_args)
++ {
++- funcall_args = (Lisp_Object *) alloca ((1 + numargs)
++- * sizeof (Lisp_Object));
+++ SAFE_ALLOCA (funcall_args, Lisp_Object *,
+++ (1 + numargs) * sizeof (Lisp_Object));
++ GCPRO1 (*funcall_args);
++ gcpro1.nvars = 1 + numargs;
++ }
++@@ -2500,7 +2506,11 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
++ }
++
++ /* By convention, the caller needs to gcpro Ffuncall's args. */
++- RETURN_UNGCPRO (Ffuncall (gcpro1.nvars, funcall_args));
+++ retval = Ffuncall (gcpro1.nvars, funcall_args);
+++ UNGCPRO;
+++ SAFE_FREE ();
+++
+++ return retval;
++ }
++ \f
++ /* Run hook variables in various ways. */
++@@ -3108,9 +3118,11 @@ apply_lambda (fun, args, eval_flag)
++ struct gcpro gcpro1, gcpro2, gcpro3;
++ register int i;
++ register Lisp_Object tem;
+++ USE_SAFE_ALLOCA;
++
++ numargs = Flength (args);
++- arg_vector = (Lisp_Object *) alloca (XINT (numargs) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA (arg_vector, Lisp_Object *,
+++ XINT (numargs) * sizeof (Lisp_Object));
++ args_left = args;
++
++ GCPRO3 (*arg_vector, args_left, fun);
++@@ -3139,6 +3151,7 @@ apply_lambda (fun, args, eval_flag)
++ tem = call_debugger (Fcons (Qexit, Fcons (tem, Qnil)));
++ /* Don't do it again when we return to eval. */
++ backtrace_list->debug_on_exit = 0;
+++ SAFE_FREE ();
++ return tem;
++ }
++
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From bc75b7b14324a78be279ee29563b3eeb7cb2aea3 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:35 -0500
++Subject: use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff
++ * An allocation problem has been fixed in let, eval, apply, and apply_lambda.
++ Patch: use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff
++ Provided-by: Sven Joachim <svenjoac@gmx.de>
++ Date: Thu, 19 Aug 2010 21:24:11 +0200
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ Previously, the content of the relevant items was invisible to the
++ garbage collector.
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 99983
++ committer: Andreas Schwab <schwab@linux-m68k.org>
++ branch nick: emacs
++ timestamp: Tue 2010-08-17 23:07:50 +0200
++ message:
++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
++ instead of SAFE_ALLOCA.
++---
++ src/ChangeLog | 5 +++++
++ src/eval.c | 14 +++++---------
++ 2 files changed, 10 insertions(+), 9 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index ba78f95..f5c73db 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -1,3 +1,8 @@
+++2010-08-17 Andreas Schwab <schwab@linux-m68k.org>
+++
+++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
+++ instead of SAFE_ALLOCA.
+++
++ 2010-08-17 Chong Yidong <cyd@stupidchicken.com>
++
++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA
++diff --git a/src/eval.c b/src/eval.c
++index 7bd27a0..6b74f5b 100644
++--- a/src/eval.c
+++++ b/src/eval.c
++@@ -1034,7 +1034,7 @@ usage: (let VARLIST BODY...) */)
++
++ /* Make space to hold the values to give the bound variables */
++ elt = Flength (varlist);
++- SAFE_ALLOCA (temps, Lisp_Object *, XFASTINT (elt) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA_LISP (temps, XFASTINT (elt));
++
++ /* Compute the values and store them in `temps' */
++
++@@ -2303,8 +2303,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
++ register int argnum = 0;
++ USE_SAFE_ALLOCA;
++
++- SAFE_ALLOCA (vals, Lisp_Object *,
++- XINT (numargs) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA_LISP (vals, XINT (numargs));
++
++ GCPRO3 (args_left, fun, fun);
++ gcpro3.var = vals;
++@@ -2476,8 +2475,7 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
++ {
++ /* Avoid making funcall cons up a yet another new vector of arguments
++ by explicitly supplying nil's for optional values */
++- SAFE_ALLOCA (funcall_args, Lisp_Object *,
++- (1 + XSUBR (fun)->max_args) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args);
++ for (i = numargs; i < XSUBR (fun)->max_args;)
++ funcall_args[++i] = Qnil;
++ GCPRO1 (*funcall_args);
++@@ -2489,8 +2487,7 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
++ function itself as well as its arguments. */
++ if (!funcall_args)
++ {
++- SAFE_ALLOCA (funcall_args, Lisp_Object *,
++- (1 + numargs) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA_LISP (funcall_args, 1 + numargs);
++ GCPRO1 (*funcall_args);
++ gcpro1.nvars = 1 + numargs;
++ }
++@@ -3121,8 +3118,7 @@ apply_lambda (fun, args, eval_flag)
++ USE_SAFE_ALLOCA;
++
++ numargs = Flength (args);
++- SAFE_ALLOCA (arg_vector, Lisp_Object *,
++- XINT (numargs) * sizeof (Lisp_Object));
+++ SAFE_ALLOCA_LISP (arg_vector, XINT (numargs));
++ args_left = args;
++
++ GCPRO3 (*arg_vector, args_left, fun);
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From e6bb7b83bd78096803a074c33a69fbbc511b6414 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:36 -0500
++Subject: fix-gnus-output-to-mail-with-live-rmail-buffers.diff
++ * Fcc should work properly even if the buffer is being visited in rmail-mode.
++ Patch: fix-gnus-output-to-mail-with-live-rmail-buffers.diff
++ Provided-by: Sven Joachim <svenjoac@gmx.de>
++ Date: Tue, 21 Sep 2010 08:14:57 +0200
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 100052
++ committer: Glenn Morris <rgm@gnu.org>
++ branch nick: emacs-23
++ timestamp: Mon 2010-09-20 20:11:34 -0700
++ message:
++ Fix message-mode bug with fcc to Rmail buffers.
++
++ * lisp/gnus/message.el (message-output): Use gnus-output-to-rmail if a
++ buffer is visiting the fcc file in rmail-mode.
++---
++ lisp/gnus/ChangeLog | 5 +++++
++ lisp/gnus/message.el | 10 ++++++++--
++ 2 files changed, 13 insertions(+), 2 deletions(-)
++
++diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
++index 4530815..a97defd 100644
++--- a/lisp/gnus/ChangeLog
+++++ b/lisp/gnus/ChangeLog
++@@ -1,3 +1,8 @@
+++2010-09-21 Glenn Morris <rgm@gnu.org>
+++
+++ * message.el (message-output): Use gnus-output-to-rmail if a buffer is
+++ visiting the fcc file in rmail-mode.
+++
++ 2010-04-22 Andreas Seltenreich <seltenreich@gmx.de>
++
++ * message.el (message-generate-headers): Record insertion of optional
++diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
++index dd230ba..3c1cb80 100644
++--- a/lisp/gnus/message.el
+++++ b/lisp/gnus/message.el
++@@ -5317,8 +5317,14 @@ Otherwise, generate and save a value for `canlock-password' first."
++
++ (defun message-output (filename)
++ "Append this article to Unix/babyl mail file FILENAME."
++- (if (and (file-readable-p filename)
++- (mail-file-babyl-p filename))
+++ (if (or (and (file-readable-p filename)
+++ (mail-file-babyl-p filename))
+++ ;; gnus-output-to-mail does the wrong thing with live, mbox
+++ ;; Rmail buffers in Emacs 23.
+++ ;; http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255
+++ (let ((buff (find-buffer-visiting filename)))
+++ (and buff (with-current-buffer buff
+++ (eq major-mode 'rmail-mode)))))
++ (gnus-output-to-rmail filename t)
++ (gnus-output-to-mail filename t)))
++
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 9f99dcafd0db14592d2f1ee982ccde6baf871ee1 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:37 -0500
++Subject: fix-fc-dual-font-width-calculation.diff
++ * The font width should now be computed correctly for dual-width fonts.
++ Patch: fix-fc-dual-font-width-calculation.diff
++ Provided-by: Sven Joachim <svenjoac@gmx.de>
++ Date: Mon, 12 Jul 2010 16:32:53 +0200
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 99907
++ author: Naohiro Aota <naota@elisp.net>
++ committer: Chong Yidong <cyd@stupidchicken.com>
++ branch nick: emacs-23
++ timestamp: Wed 2010-06-30 10:22:18 -0400
++ message:
++ Check FC_DUAL too. For such fonts, check width one by one (Bug#4129).
++ * xftfont.c (xftfont_open): Check font width one by one also when
++ spacing is dual.
++
++ * ftfont.c (ftfont_open): Ditto.
++---
++ src/ChangeLog | 7 +++++++
++ src/ftfont.c | 2 +-
++ src/xftfont.c | 2 +-
++ 3 files changed, 9 insertions(+), 2 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index f5c73db..59eaf48 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -8,6 +8,13 @@
++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA
++ (Bug#6214).
++
+++2010-06-30 Naohiro Aota <naota@elisp.net> (tiny change)
+++
+++ * xftfont.c (xftfont_open): Check font width one by one also when
+++ spacing is dual.
+++
+++ * ftfont.c (ftfont_open): Ditto.
+++
++ 2010-05-18 Chong Yidong <cyd@stupidchicken.com>
++
++ * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
++diff --git a/src/ftfont.c b/src/ftfont.c
++index 6956c13..7801f22 100644
++--- a/src/ftfont.c
+++++ b/src/ftfont.c
++@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size)
++ spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
++ else
++ spacing = FC_PROPORTIONAL;
++- if (spacing != FC_PROPORTIONAL)
+++ if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
++ font->min_width = font->average_width = font->space_width
++ = (scalable ? ft_face->max_advance_width * size / upEM
++ : ft_face->size->metrics.max_advance >> 6);
++diff --git a/src/xftfont.c b/src/xftfont.c
++index 5d4581b..197cc9c 100644
++--- a/src/xftfont.c
+++++ b/src/xftfont.c
++@@ -429,7 +429,7 @@ xftfont_open (f, entity, pixel_size)
++ ascii_printable[i] = ' ' + i;
++ }
++ BLOCK_INPUT;
++- if (spacing != FC_PROPORTIONAL)
+++ if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
++ {
++ font->min_width = font->average_width = font->space_width
++ = xftfont->max_advance_width;
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 442c60f800173341e149d303f7c4b5c033f31a53 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:38 -0500
++Subject: do-not-initialize-terminal-twice.diff
++ * The terminal should no longer be initialized twice.
++ Patch: do-not-initialize-terminal-twice.diff
++ Provided-by: Courtney Bane <debian-bugs-5265@cbane.org>
++ Date: Thu, 07 Oct 2010 12:58:15 -0500
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 100029
++ author: Anonymous <emacs-bugs-7626@cbane.org>
++ committer: Stefan Monnier <monnier@iro.umontreal.ca>
++ branch nick: emacs-23
++ timestamp: Sat 2010-09-11 14:53:21 +0200
++ message:
++ * src/term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).
++---
++ src/ChangeLog | 4 ++++
++ src/term.c | 1 -
++ 2 files changed, 4 insertions(+), 1 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index 59eaf48..8d42a1e 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -1,3 +1,7 @@
+++2010-09-11 Anonymous <emacs-bugs-7626@cbane.org> (tiny change)
+++
+++ * term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).
+++
++ 2010-08-17 Andreas Schwab <schwab@linux-m68k.org>
++
++ * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
++diff --git a/src/term.c b/src/term.c
++index 7adaeea..4a8efcb 100644
++--- a/src/term.c
+++++ b/src/term.c
++@@ -250,7 +250,6 @@ tty_set_terminal_modes (struct terminal *terminal)
++ cmputc ('\n');
++ }
++
++- OUTPUT_IF (tty, tty->TS_termcap_modes);
++ OUTPUT_IF (tty, visible_cursor ? tty->TS_cursor_visible : tty->TS_cursor_normal);
++ OUTPUT_IF (tty, tty->TS_keypad_mode);
++ losecursor (tty);
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 6e4370372ed0900861ba8d832974c70a96490d44 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:39 -0500
++Subject: fix-epg-digest-algorithm-alist.diff
++ * The value for RIPEMD-160 in epg-digest-algorithm-alist has been fixed.
++ Patch: fix-epg-digest-algorithm-alist.diff
++ Provided-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
++ Date: Thu, 26 Aug 2010 14:09:01 UTC
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 102553
++ committer: Daiki Ueno <ueno@unixuser.org>
++ branch nick: trunk
++ timestamp: Fri 2010-12-03 10:52:43 +0900
++ message:
++ Trivial fixes for epg.el.
++
++ * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
++ "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor.
++ (epg-context-set-passphrase-callback): Mention that the callback
++ is not called when used with GnuPG 2.x.
++---
++ lisp/ChangeLog | 7 +++++++
++ lisp/epg.el | 10 ++++++++--
++ 2 files changed, 15 insertions(+), 2 deletions(-)
++
++diff --git a/lisp/ChangeLog b/lisp/ChangeLog
++index ebb21c4..f5b616d 100644
++--- a/lisp/ChangeLog
+++++ b/lisp/ChangeLog
++@@ -1,3 +1,10 @@
+++2010-12-03 Daiki Ueno <ueno@unixuser.org>
+++
+++ * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
+++ "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor.
+++ (epg-context-set-passphrase-callback): Mention that the callback
+++ is not called when used with GnuPG 2.x.
+++
++ 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
++
++ * Version 23.2 released.
++diff --git a/lisp/epg.el b/lisp/epg.el
++index 9fde76d..ad172df 100644
++--- a/lisp/epg.el
+++++ b/lisp/epg.el
++@@ -66,7 +66,7 @@
++ (defconst epg-digest-algorithm-alist
++ '((1 . "MD5")
++ (2 . "SHA1")
++- (3 . "RMD160")
+++ (3 . "RIPEMD160")
++ (8 . "SHA256")
++ (9 . "SHA384")
++ (10 . "SHA512")
++@@ -335,7 +335,13 @@ PASSPHRASE-CALLBACK is either a function, or a cons-cell whose
++ car is a function and cdr is a callback data.
++
++ The function gets three arguments: the context, the key-id in
++-question, and the callback data (if any)."
+++question, and the callback data (if any).
+++
+++The callback may not be called if you use GnuPG 2.x, which relies
+++on the external program called `gpg-agent' for passphrase query.
+++If you really want to intercept passphrase query, consider
+++installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase
+++query by itself and Emacs can intercept them."
++ (unless (eq (car-safe context) 'epg-context)
++ (signal 'wrong-type-argument (list 'epg-context-p context)))
++ (aset (cdr context) 7 (if (consp passphrase-callback)
++--
++1.7.4.1
++
--- /dev/null
--- /dev/null
++From 9912f34116800059da8d5dc65df7b5863ea923bf Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 4 Apr 2011 22:46:40 -0500
++Subject: mention-maximized-in-emacs-manpage.diff
++ * The emacs manpage now mentions the "maximized" value for fullscreen.
++ Patch: mention-maximized-in-emacs-manpage.diff
++ Provided-by: Sven Joachim <svenjoac@gmx.de>
++ Date: Wed, 25 Aug 2010 17:54:33 +0200
++ Added-by: Rob Browning <rlb@defaultvalue.org>
++ Status: incorporated upstream
++
++ The Debian patch is taken from this upstream commit:
++
++ revno: 100003
++ committer: Chong Yidong <cyd@stupidchicken.com>
++ branch nick: emacs-23
++ timestamp: Thu 2010-08-26 11:14:55 -0400
++ message:
++ * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
++---
++ doc/man/ChangeLog | 4 ++++
++ doc/man/emacs.1 | 5 +++--
++ 2 files changed, 7 insertions(+), 2 deletions(-)
++
++diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
++index 290482b..3bee2a1 100644
++--- a/doc/man/ChangeLog
+++++ b/doc/man/ChangeLog
++@@ -1,3 +1,7 @@
+++2010-08-26 Sven Joachim <svenjoac@gmx.de>
+++
+++ * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
+++
++ 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
++
++ * Version 23.2 released.
++diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
++index a42c07e..48ffdee 100644
++--- a/doc/man/emacs.1
+++++ b/doc/man/emacs.1
++@@ -403,11 +403,12 @@ sets the window's text color.
++ The desired fullscreen size.
++ The value can be one of
++ .IR fullboth ,
+++.IR maximized ,
++ .IR fullwidth ,
++ or
++ .IR fullheight ,
++-which correspond to the command-line options `\-fs', `\-fw', and
++-`\-fh', respectively.
+++which correspond to the command-line options `\-fs', `-mm', `\-fw',
+++and `\-fh', respectively.
++ Note that this applies to the initial frame only.
++ .TP
++ .BR geometry " (class " Geometry )
++--
++1.7.4.1
++
--- /dev/null
- debian-site-init-el.diff
- debian-startup.diff
- handle-dfsg-split.diff
- misc-unseparated.diff
- require-movemail-use-liblockfile.diff
- avoid-fakemail-mail-loss.diff
- version-mention-debian.diff
- look-for-news-to-find-etc.diff
- fix-flymake-xmlstarlet-invocation.diff
- add-unix-to-cpp-undefs.diff
- fix-gnu-kfreebsd-startup.diff
- prevent-string-stack-overflow.diff
- prevent-let-eval-apply-stack-overflow.diff
- use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff
- fix-gnus-output-to-mail-with-live-rmail-buffers.diff
- fix-fc-dual-font-width-calculation.diff
- do-not-initialize-terminal-twice.diff
- fix-epg-digest-algorithm-alist.diff
- mention-maximized-in-emacs-manpage.diff
++0001-debian-site-init-el.diff.patch
++0002-debian-startup.diff.patch
++0003-handle-dfsg-split.diff.patch
++0004-misc-unseparated.diff.patch
++0005-require-movemail-use-liblockfile.diff.patch
++0006-avoid-fakemail-mail-loss.diff.patch
++0007-version-mention-debian.diff.patch
++0008-look-for-news-to-find-etc.diff.patch
++0009-fix-flymake-xmlstarlet-invocation.diff.patch
++0010-add-unix-to-cpp-undefs.diff.patch
++0011-fix-gnu-kfreebsd-startup.diff.patch
++0012-prevent-string-stack-overflow.diff.patch
++0013-prevent-let-eval-apply-stack-overflow.diff.patch
++0014-use-safe-alloca-lisp-in-let-eval-apply-apply_lambda..patch
++0015-fix-gnus-output-to-mail-with-live-rmail-buffers.diff.patch
++0016-fix-fc-dual-font-width-calculation.diff.patch
++0017-do-not-initialize-terminal-twice.diff.patch
++0018-fix-epg-digest-algorithm-alist.diff.patch
++0019-mention-maximized-in-emacs-manpage.diff.patch
projects / emacs.git / commitdiff